Forgotten files

svn path=/trunk/; revision=20080

diff --git a/ChangeLog b/ChangeLog
index 54ed50e109fd97abc4d0ce37517644d11a401042..9fd30c6c7b9b91f22213c21b7b1f6e388dee2341 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2008-05-05  Matthias Clasen  <mclasen@redhat.com>
+
+       Apply a patch by Marek Kasik <mkasik@redhat.com> to display
+       more printer status information in the print dialog. 
+
+       * modules/printbackends/cups/gtkprintbackendcups.c: Translate
+       printer-state-reasons into suitable messages and icons.
+
+       * gtk/stock-icons/16/gtk-print-error.{svg,png}:
+       * gtk/stock-icons/16/gtk-print-report.{svg,png}:
+       * gtk/stock-icons/16/gtk-print-warning.{svg,png}:
+       * gtk/Makefile.am: 
+       * gtk/gtkiconfactory.c:
+       * gtk/gtkstock.h: New stock icons to display printer state.
+
 2008-05-07  Michael Natterer  <mitch@imendio.com>
 
        * gdk/gdkinternals.h

diff --git a/gtk/gtkiconfactory.c b/gtk/gtkiconfactory.c
index da44564f11dd413780fda057c3f156032a90abd3..7e1c7a96fa3aff73669f023863eab45294ad88ec 100644 (file)
--- a/gtk/gtkiconfactory.c
+++ b/gtk/gtkiconfactory.c
@@ -451,7 +451,10 @@ get_default_icons (GtkIconFactory *factory)
   register_stock_icon (factory, GTK_STOCK_PASTE);
   register_stock_icon (factory, GTK_STOCK_PREFERENCES);
   register_stock_icon (factory, GTK_STOCK_PRINT);
+  register_stock_icon (factory, GTK_STOCK_PRINT_ERROR);
   register_stock_icon (factory, GTK_STOCK_PRINT_PREVIEW);
+  register_stock_icon (factory, GTK_STOCK_PRINT_REPORT);
+  register_stock_icon (factory, GTK_STOCK_PRINT_WARNING);
   register_stock_icon (factory, GTK_STOCK_PROPERTIES);
   register_bidi_stock_icon (factory, 
                            GTK_STOCK_REDO,